09c471f8fa165dd976d1b43a285b1ab34197b6e2,source/jetbrains/mps/vcs/ui/MergeResultView.java,MergeResultView,collectSetNodeConflicts,#,215

Before Change


    List<SetNodeChange> sets = getChanges(SetNodeChange.class);

    for (SetNodeChange spc : sets) {
      if (changes.get(spc.getNodeParent()) == null) {
        changes.put(spc.getNodeParent(), new HashSet<SetNodeChange>());
      }

After Change



    for (SetNodeChange spc : sets) {
      if (changes.get(new Pair<String, String>(spc.getNodeParent(), spc.getNodeRole())) == null) {
        changes.put(new Pair<String, String>(spc.getNodeParent(), spc.getNodeRole()), new HashSet<SetNodeChange>());
      }

      changes.get(new Pair<String, String>(spc.getNodeParent(), spc.getNodeRole())).add(spc);